From: Jonas Dreßler <verdre@v0yd.nl>
Date: Sun, 31 May 2020 21:19:59 +0000 (+0200)
Subject: workspace: Use boundingBox instead of getOriginalPosition()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~684^2^2~326
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2d650e51a5727e12b76c25068815e6cc365f3f6b;p=gnome-shell.git

workspace: Use boundingBox instead of getOriginalPosition()

The getOriginalPosition() API of WindowClone can easily be replaced by
using the existing boundingBox property, which reflects the windows
bounding box in absolute coordinates. This property is also used
everywhere else in the Workspace object, so we can use it here, too.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1294
---

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 960514911..6521275ea 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -274,10 +274,6 @@ var WindowClone = GObject.registerClass({
         return this._boundingBox.height;
     }
 
-    getOriginalPosition() {
-        return [this._boundingBox.x, this._boundingBox.y];
-    }
-
     _computeBoundingBox() {
         let rect = this.metaWindow.get_frame_rect();
 
@@ -1726,11 +1722,10 @@ class Workspace extends St.Widget {
             overlay.hide();
 
         if (clone.metaWindow.showing_on_its_workspace()) {
-            let [origX, origY] = clone.getOriginalPosition();
             clone.scale_x = 1;
             clone.scale_y = 1;
-            clone.x = origX;
-            clone.y = origY;
+            clone.x = clone.boundingBox.x;
+            clone.y = clone.boundingBox.y;
             clone.ease({
                 opacity,
                 duration,
@@ -1778,10 +1773,9 @@ class Workspace extends St.Widget {
             overlay.hide();
 
         if (clone.metaWindow.showing_on_its_workspace()) {
-            let [origX, origY] = clone.getOriginalPosition();
             clone.ease({
-                x: origX,
-                y: origY,
+                x: clone.boundingBox.x,
+                y: clone.boundingBox.y,
                 scale_x: 1,
                 scale_y: 1,
                 opacity: 255,